auto merge of #157 : rust-lang/cargo/graph-resolve, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 10 Jul 2014 19:52:04 +0000 (19:52 +0000)
committerbors <bors@rust-lang.org>
Thu, 10 Jul 2014 19:52:04 +0000 (19:52 +0000)
This incorporates previous bugfixes by @alexcrichton that are still stuck in bors.


Trivial merge